Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorRobert Lipe <robertlipe@gpsbabel.org>
Fri, 30 Jun 2017 17:29:09 +0000 (12:29 -0500)
committerRobert Lipe <robertlipe@gpsbabel.org>
Fri, 30 Jun 2017 17:29:09 +0000 (12:29 -0500)

Trivial merge